Simplify actionbar

We don't need a frame widget here, just render a top border on the
box.

diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index b88b1d8da9a0a7bb01be55ff3b900a50fd9ff20c..84c43a83a4bb419b951e59dfa3a8eba80d96cc08 100644 (file)
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -251,8 +251,9 @@ gtk_action_bar_allocate (GtkCssGadget        *gadget,
                          gpointer             data)
 {
   GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
+  GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (GTK_ACTION_BAR (widget));
 
-  GTK_WIDGET_CLASS (gtk_action_bar_parent_class)->size_allocate (widget, (GtkAllocation *)allocation);
+  gtk_widget_size_allocate (priv->revealer, (GtkAllocation *)allocation);
 
   gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
 }

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 250dce1a45da8b6170dc3ef72653fc793003c932..17fa5c76c0163d9b7774390fc97b35728134a4a4 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2514,12 +2514,9 @@ paper {
   &:backdrop { border-color: $backdrop_borders_color; }
 }
 
-actionbar frame border {
-  border-width: 1px 0 0;
-}
-
 actionbar box {
   padding: 6px;
+  border-width: 1px 0 0;
 }
 
 placessidebar,

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9db0bb5fd066b933108823d21d7a1ca3c68317c9..c5c07495442a417da55e59d946e75f18516e902a 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3506,11 +3506,9 @@ paper {
   paper:backdrop {
     border-color: #1f2222; }
 
-actionbar frame border {
-  border-width: 1px 0 0; }
-
 actionbar box {
-  padding: 6px; }
+  padding: 6px;
+  border-width: 1px 0 0; }
 
 placessidebar viewport.frame,
 scrolledwindow viewport.frame {

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 5d0a8334f246d66e93dab4d79fc759a594fed2f0..72012a908dc7a5ec545b786951f2716d559f89c4 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3668,11 +3668,9 @@ paper {
   paper:backdrop {
     border-color: #a5a5a1; }
 
-actionbar frame border {
-  border-width: 1px 0 0; }
-
 actionbar box {
-  padding: 6px; }
+  padding: 6px;
+  border-width: 1px 0 0; }
 
 placessidebar viewport.frame,
 scrolledwindow viewport.frame {

diff --git a/gtk/ui/gtkactionbar.ui b/gtk/ui/gtkactionbar.ui
index 16fab16bcd314ea26b5340a886ff89d13b51f0df..d826768f3b4a68a63eab40272ca18f517c6c418a 100644 (file)
--- a/gtk/ui/gtkactionbar.ui
+++ b/gtk/ui/gtkactionbar.ui
@@ -6,17 +6,9 @@
       <object class="GtkRevealer" id="revealer">
         <property name="visible">1</property>
         <child>
-          <object class="GtkFrame" id="frame">
+          <object class="GtkBox" id="box">
             <property name="visible">1</property>
-            <style>
-              <class name="action-bar"/>
-            </style>
-            <child>
-              <object class="GtkBox" id="box">
-                <property name="visible">1</property>
-                <property name="spacing">6</property>
-              </object>
-            </child>
+            <property name="spacing">6</property>
           </object>
         </child>
       </object>